From: Koos85 Date: Fri, 25 Sep 2020 09:39:01 +0000 (+0200) Subject: removed some comments X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~2^2~3^2~2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=89bfc043829d69e0d66b1e805675cc438e44562f;p=siridb-server.git removed some comments --- diff --git a/itest/querygenerator/querygenerator.py b/itest/querygenerator/querygenerator.py index 816b49b4..4c53478f 100644 --- a/itest/querygenerator/querygenerator.py +++ b/itest/querygenerator/querygenerator.py @@ -49,19 +49,28 @@ class QueryGenerator(list): yield q def _on_Regex(self, q, i): - re_map = self.regex_map[self[-1]] - for ename in self[::-1]: - val = re_map.get(ename) - if val is not None: - q[i] = val - yield q - break + regex_ename = self[-1] + if regex_ename in self.regex_map: + re_map = self.regex_map[regex_ename] + for ename in self[::-1]: + val = re_map.get(ename) + if val is not None: + q[i] = val + yield q + break + + # debug code + + # else: + # print('no value found for:') + # print(ename) + # print(q[:i+1]) + # print(i, len(self), self) + # print(self.regex_map) # else: - # print('no value found for:') - # print(self[-1]) - # print(q[:i+1]) - # print(i, len(self), self) - # print(self.regex_map) + # print('unknown regex element') + # print(ename) + def _on_Token(self, q, i): q[i] = q[i]._token @@ -87,19 +96,12 @@ class QueryGenerator(list): else: name = getattr(q[i], 'name', getattr(q[i]._element, 'name', None)) n = self.max_list_n_map.get(name, self.default_list_n) - # print(n, getattr(q[i], 'name', None)) if q[i]._max: n = min(n, q[i]._max) eles = list(q[i]._elements)[:1] + \ [q[i]._delimiter, list(q[i]._elements)[0]]*(n-1) - # if getattr(q[i]._delimiter, '_token', None) == ',': - # eles = list(q[i]._elements)[:1] + \ - # [q[i]._delimiter, - # list(q[i]._elements)[0]]*(self.max_list_n_simple-1) - # else: - # eles = list(q[i]._elements)[:1]+[q[i]._delimiter, - # list(q[i]._elements)[0]]*(self.max_list_n-1) + q0 = q[:i]+eles+q[i+1:] yield q0